From: Julien Grall Date: Tue, 21 May 2019 14:24:55 +0000 (+0100) Subject: xen/arm64: livepatch: Fix build after 03957f58db X-Git-Tag: archive/raspbian/4.14.0+80-gd101b417b7-1+rpi1^2~63^2~2184 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22Dat/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22Dat?a=commitdiff_plain;h=4973997f70860c10093ce34294be0c588ddc8cf3;p=xen.git xen/arm64: livepatch: Fix build after 03957f58db Commit 03957f58db "xen/const: Extend the existing macro BIT to take a suffix in parameter" didn't convert all the callers of the macro BIT. This will result to a build breakage when enabling Livepatch on arm64. Reported-by: Andrew Cooper Signed-off-by: Julien Grall Acked-by: Andrew Cooper --- diff --git a/xen/arch/arm/arm64/livepatch.c b/xen/arch/arm/arm64/livepatch.c index 2247b925a0..5c75779284 100644 --- a/xen/arch/arm/arm64/livepatch.c +++ b/xen/arch/arm/arm64/livepatch.c @@ -208,7 +208,7 @@ static int reloc_insn_imm(enum aarch64_reloc_op op, void *dest, u64 val, sval >>= lsb; /* Extract the value bits and shift them to bit 0. */ - imm_mask = (BIT(lsb + len) - 1) >> lsb; + imm_mask = (BIT(lsb + len, UL) - 1) >> lsb; imm = sval & imm_mask; /* Update the instruction's immediate field. */